From 72db203672e706c05f3129f54b549199805c21fb Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Sun, 14 Feb 2016 14:21:01 +0100 Subject: [PATCH] Adwaita: fix scale popup button size --- gtk/theme/Adwaita/_common.scss | 13 +++++-------- gtk/theme/Adwaita/gtk-contained-dark.css | 9 +++------ gtk/theme/Adwaita/gtk-contained.css | 9 +++------ 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index d5cb327f9f..59b06a3b17 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -3568,17 +3568,14 @@ colorswatch { .scale-popup { - .osd & { @extend %osd; } + .osd & { @extend %osd; } - .osd & button.flat { //FIXME: quick hack, redo properly - padding: 6px; - border-style: none; - border-radius: 5px; - } + .osd & button.flat { //FIXME: quick hack, redo properly + border-style: none; + border-radius: 5px; + } button { // +/- buttons on GtkVolumeButton popup - padding: 6px; - &:hover { @extend %undecorated_button; background-color: transparentize($fg_color,0.9); diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index c93f36acd7..bf7ad2c9c1 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -4288,14 +4288,11 @@ colorswatch#editor-color-sample { .osd .scale-popup button.flat, .osd .scale-popup notebook > header > tabs > arrow, .osd .scale-popup button.sidebar-button, .osd .scale-popup headerbar button.titlebutton, headerbar .osd .scale-popup button.titlebutton, .osd .scale-popup .titlebar button.titlebutton, .titlebar .osd .scale-popup button.titlebutton { - padding: 6px; border-style: none; border-radius: 5px; } -.scale-popup button { - padding: 6px; } - .scale-popup button:hover { - background-color: rgba(238, 238, 236, 0.1); - border-radius: 5px; } +.scale-popup button:hover { + background-color: rgba(238, 238, 236, 0.1); + border-radius: 5px; } /********************** * Window Decorations * diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 2c633caee5..770534ec39 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -4429,14 +4429,11 @@ colorswatch#editor-color-sample { .osd .scale-popup button.flat, .osd .scale-popup notebook > header > tabs > arrow, .osd .scale-popup button.sidebar-button, .osd .scale-popup headerbar button.titlebutton, headerbar .osd .scale-popup button.titlebutton, .osd .scale-popup .titlebar button.titlebutton, .titlebar .osd .scale-popup button.titlebutton { - padding: 6px; border-style: none; border-radius: 5px; } -.scale-popup button { - padding: 6px; } - .scale-popup button:hover { - background-color: rgba(46, 52, 54, 0.1); - border-radius: 5px; } +.scale-popup button:hover { + background-color: rgba(46, 52, 54, 0.1); + border-radius: 5px; } /********************** * Window Decorations * -- 2.30.2